Code formatted
Added methods