Code Cleanup. Got rid of unncessary if statements.