Cleaning source
Revert "Cleaning source"

This reverts commit 272e53f7b0cfcec6fd1115dd8c9f93e9cc52e6ff.
Cleaning source - addresses #2
Allowing multiple configurations - Addresses #1
Cleaning source up a bit - addresses #2