P03E01: Bugfix

now checking time and minutes
P03E02: just organising the code