Cleaned up and customized some files