Clean Up

There have been some changes to the main code. The purpose of this
commit is mainly to do a full clean up in github.