Cleaned up / added comments