Cleaned up code, removed debug statements