fixed formatting
Added extension methods