Better readability and fail proof concept