Fixed styling
Added DEFAULT_EXPIRATION constant
Fixed some more issues introduced by previous commits