Declare variables, add missing semicomons, indent