Metaprogramming added and removed unnecessary sections