Commented and cleaned up files