Fixes

Made redundant code more obvious, fixed issue with time import by not
casting the variable.