removed comments; refactored elifs