Update

More Comments, cleaner code