Code clean up && small features