Made @Shimuuar's suggested changes.