Moved add timeframe if relevant logic to seperate method, created guard statements instead of else