Cleaned up some style things.
Got rid of unncessary test against count, should only check it after incrementing.