Simplifing code
Merge pull request #2 from codehacktivism/simplify_conditions

Simplifing code