Made use 1 minute as constant.
Added some TODOs and cleanup.