Cleaned up and added header