Little refactoring is in progress + learning DB table