Cleaned up start and stop a bit