Cleaned up code in header a bit