formatting based on @beloglazov comments