Fixed indentation and fixed getValue(this) calls