improved formatting and added the __line__ variable to help with debugging