replaced 'static'-calls with 'self', removed alignment