Cleanup

Remove magic value references

Replace reinforce() with proper method call

Fix javadocs

Replace tab with space
Fix missing check for RVC