Cleaned up the code a little. Simplified ifs.