cleaned up a little, statements that end with curly braces don't need semicolons, ternary operator