Revert "Added Features, Cosmetic Changes"

This reverts commit c0aa95bda807d951c067d9d3e65864f937113390.