Edited Header, cleaned up codes