Cleaned out the horrible dot aliases and added comments