Cleaner version of files with better comments and documentation