Cleaned up code - remove empty lines / non-essential vardumps/echos