Commented and Cleaned up