Cleaning up minor BS