Minor cleanup

Just did some minor cleanup, like removing extra lines and so on.