Simplified build

* Removed make procedures
* Re-indented code
* Some code-corrections