Revert "Cleaned up code"

This reverts commit 2b686fad73cc0d4f332e76850e1daed6ddb6bb8c.