Variable naming fixes and better spacing