Removing Silly if() Statement