Style fixes
Added more methods