Turned everything to methods