Cleaned code for new files