Non-virtual methods
Code clean up