Remove magic numbers
Delete unused variable
Remove timer call on startup