Removed pin-to-start functionality, minor refactor