Tracking & formatting

Added tracking and formatted the source a little better