diff --git a/CHANGELOG.md b/CHANGELOG.md
index a05b253f..6a375e97 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,2 +1,9 @@
+# Flextype 0.2.0, 2018-03-XX
+* Thunderer Shortcode Framework - added
+* Cache Flextype::VERSION for cache key - added
+* flextype/boot/shortcodes.php	- removed
+* flextype/boot/events.php - removed
+* Code cleanup and refactoring #5
+
 # Flextype 0.1.0, 2018-03-21
 * Initial Release
diff --git a/LICENSE.txt b/LICENSE.txt
index a34d214f..3f865be1 100755
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 Flextype Content Management
+Copyright (c) 2018 Flextype
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/composer.json b/composer.json
index 11835136..3171b847 100755
--- a/composer.json
+++ b/composer.json
@@ -1,8 +1,8 @@
 {
     "name": "flextype/flextype",
-    "type": "library",
+    "type": "project",
     "description": "Flextype is Modern Open Source Flat-File Content Management System",
-    "keywords": ["Flextype", "php", "cms", "flat-file", "markdown"],
+    "keywords": ["Flextype", "php", "cms", "flat-file cms", "flat cms", "flatfile cms", "markdown"],
     "homepage": "http://flextype.org",
     "license": "MIT",
     "authors": [
diff --git a/flextype/Cache.php b/flextype/Cache.php
index a390a6df..184157f6 100755
--- a/flextype/Cache.php
+++ b/flextype/Cache.php
@@ -9,7 +9,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
- 
+
 namespace Flextype;
 
 class Cache
@@ -232,10 +232,6 @@ class Cache
     /**
      * Initialize Flextype Cache
      *
-     *  <code>
-     *      Cache::init();
-     *  </code>
-     *
      * @access public
      * @return object
      */
diff --git a/flextype/Config.php b/flextype/Config.php
index 4c71e3d3..bc59abaf 100755
--- a/flextype/Config.php
+++ b/flextype/Config.php
@@ -9,7 +9,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
- 
+
 namespace Flextype;
 
 use Arr;
@@ -86,10 +86,6 @@ class Config
     /**
      * Get config array
      *
-     *  <code>
-     *      $config = Config::getConfig();
-     *  </code>
-     *
      * @access  public
      * @return array
      */
@@ -101,10 +97,6 @@ class Config
     /**
      * Initialize Flextype Config
      *
-     *  <code>
-     *      Config::init();
-     *  </code>
-     *
      * @access  public
      */
     public static function init()
diff --git a/flextype/Filters.php b/flextype/Filters.php
index 10825113..3f05e863 100755
--- a/flextype/Filters.php
+++ b/flextype/Filters.php
@@ -42,10 +42,6 @@ class Filters
     /**
      * Dispatch filters
      *
-     *  <code>
-     *      Filter::dispatch('content', $content);
-     *  </code>
-     *
      * @access  public
      * @param  string $filter_name The name of the filter hook.
      * @param  mixed  $value       The value on which the filters hooked.
@@ -85,14 +81,6 @@ class Filters
     /**
      * Add filter
      *
-     *  <code>
-     *      Filter::add('content', 'replacer');
-     *
-     *      function replacer($content) {
-     *          return preg_replace(array('/\[b\](.*?)\[\/b\]/ms'), array('<strong>\1</strong>'), $content);
-     *      }
-     *  </code>
-     *
      * @access  public
      * @param  string  $filter_name     The name of the filter to hook the $function_to_add to.
      * @param  string  $function_to_add The name of the function to be called when the filter is applied.
diff --git a/flextype/I18n.php b/flextype/I18n.php
index 840d909a..bc29e985 100644
--- a/flextype/I18n.php
+++ b/flextype/I18n.php
@@ -133,10 +133,6 @@ class I18n
     /**
      * Initialize Flextype I18n
      *
-     *  <code>
-     *      I18n::init();
-     *  </code>
-     *
      * @access public
      * @return object
      */
diff --git a/flextype/Markdown.php b/flextype/Markdown.php
index afcd2192..ad4a6c27 100644
--- a/flextype/Markdown.php
+++ b/flextype/Markdown.php
@@ -27,10 +27,6 @@ class Markdown
     /**
      * Markdown parser
      *
-     *  <code>
-     *      $content = Markdown::parse($content);
-     *  </code>
-     *
      * @access  public
      * @param  string $content Content to parse
      * @return string Formatted content
diff --git a/flextype/Pages.php b/flextype/Pages.php
index 2b193001..ae479b54 100755
--- a/flextype/Pages.php
+++ b/flextype/Pages.php
@@ -197,10 +197,6 @@ class Pages
     /**
      * Initialize Flextype Pages
      *
-     *  <code>
-     *      Pages::init();
-     *  </code>
-     *
      * @access public
      * @return object
      */
diff --git a/flextype/Plugins.php b/flextype/Plugins.php
index 53b3fc07..34e89c6e 100755
--- a/flextype/Plugins.php
+++ b/flextype/Plugins.php
@@ -92,10 +92,6 @@ class Plugins
     /**
      * Initialize Flextype Plugins
      *
-     *  <code>
-     *      Plugins::init();
-     *  </code>
-     *
      * @access public
      * @return object
      */
diff --git a/flextype/Shortcodes.php b/flextype/Shortcodes.php
index 295e58d9..1d12ddb5 100644
--- a/flextype/Shortcodes.php
+++ b/flextype/Shortcodes.php
@@ -60,7 +60,7 @@ class Shortcodes
     /**
      * Register default shortcodes
      *
-     * @access public
+     * @access protected
      */
     protected static function registerDefaultShortcodes()
     {