Fixing some formatting issues, cleaning up a little...