Code cleanup
Abstract class