Change the method name for more descriptive one
Formatting changes
Wrapping some "freak code" into private method