Refactor code

This is a temprary code.