Added formatter and improved comments