Clean up uneccessary else statement
More cleanup