Added small functionality and improved formatting