Cleaned up + Comments