Code clean up and new stls